Fix spelling & other stuff