Fixed a few more bits and pieces. Going blind looking for more.