Improved logging, packaging