comment adjustments and bugfixes