added command choices, loops