+ Merged Nick's Fix
+ Fixed some more
+ Fixed