Add comment field and some transient helpers
Fix sort column