Style fixing. Bugs fixing. Comments