Added a few more commands and fixed some problems