re-order panes
remove unused rules, add comments