fixes to basic cf commands