Fixed lots of little mistakes