2.06.3:minrog:10 #186 and others

Some random fixes and a bit of work on the re-formatting in decisions.