latest fixes and changes