sorting of conditions into table + some small improvments