Small fixes + comments to code.