clean up abilities, reorder columns in standard
report, add some tests