added some pre-checks before running commands, disabled draw-grid changes