Restored more functionality. Fixed command