Few command cleanups and enhancements