Minor fix and change rainbow-mode invocation