Added commands, fixes