Fixed a few things - commits are fine-grained and tell the story