clean up packaging, logging and some other goodies