Tweak conditionals, comments and copyright date