mayor/massige speed improvement and bugfix