Packaging
Remove debug output, improve error handling