comments, explicit newlines, and fixed some | vs : errors