fix "r" command when no canvas specified, cleanups