Added some Commands and fixed some bugs