Fixed a few things, changed around commands a bit