Lots of Fixes