Lot's of cleaning up, more to come later in the day. Improved things
here and there.