Comments and bugfxes