updated to latest fixes