Fixed some commands so they can be executed from the console