. move stuff a bit, so it works in PyCharm IDE (I'm tired enough with 'test_project.settings not found')
. fix a nasty bug with ordering
. re-write ordering and report types in a more sensible manner