some general cleanup

getting ready to merge with master