Completed #ifdef/ifndef support.  Cleaned up console spam.