More commenting/bugfixes