fix more issues
bump versions