updated to latest fixes on master