Moved modified commands over to the NCCommandHandler, fixed commands with arguments not working proplery