Implemented more commands and other bugfixes