Fixed lots of stuf...