Ack stuff, changed command flags to enum