Improved some cli feedback