Fixed lots of little bugs\!