Fixed lots of stuff and added lots of stuff.