CEO: Bugfix update Oct 24

Various minor bugfixes