Fix several mistakes I made because I was too eager to share my work with the world :)