Fix preprocessor, update comment, etc.