general clean up

small changes...