Added commands, modified controls