Added support for more commands

and fixed existing ones