Fixed some more details

Blah wonderful!