Updated for some bug fixes and removed a command