Comments, more #defines