Fixed lots of stuff