Better cli output and fix unpacker