bugfixes, mostly as a result of removing ae timer
bugfix for multiple clusters