Comments and Bugfixes