fixed up some stuff and add classes
Merge branch 'master' into rob