Added a few more commands and fixed older ones