fixed OAG head sticking
misc fixes