Added 4 commands and fixed some issues