Comments + Bugfixes