Fixed lots of things