bug fixing and performance optimization
* logs have been commented out, because they caused calc time spikes
* outdated logs have been removed