few performance calculation bugfixes