More commenting + fixes.