Fixing bugs. Finishing comments