Fixed lots of mistakes!