Correct typos in comments.
Re-order sequence of conditional compile checks.
updates