Wow, so many fixes
Merged