correct ordering
special clauses added
comments fixed