Implemented rest of commands, minor changes.