Fixed things

Also finished 10