latest fixes for everything