Fixes
Lots of patches