more cleanup
packaging touchups