Improved cli and packaging