minor edits, fixed ifndef directives