Fixes and changes and lots more..