output comments, improved conditionals.