freshen up some things
more cleanup/updates