Command & File handling fixes and enhancements