more updates on conditional compiling, comments