motor stuff and corrections to git