Bugfixes & commenting.