reordering sections fixes #17 and #2