Code review :D

Here's a bunch of commits that @akaptur and I wrote up. More to come :)