misc code cleanup/updates
Merge branch 'master' of github.com:eddiejhong/rs_ab