Miscellaneous updates, primarily surrounding operator colorization