Lots of fixes that I can't remember
Update to all current changes, just to get this version committed..