Improved cli feedback