changed commands, code fixes