Nitpicking

Joining this with master from now. Will check out branches for fixes individually.