bad Tim! run tests before pushing
merge with master
fixed some more errors