code cleanup and some things
Merge branch 'master' of github.com:marykw/RBOR