typo fix and support for some basic OFF ON defines