Added a few commands and fixed a few bugs