Fixed a dumb bug I've made. Not sure why the other commits are listed here, but they will be squashed anyway.