Fixing comments, improving code readability, bug fixes.