fixed alphabetical order when property is used more than once, improved comment handling