Citizens, optimization, bugfixes