Fixed counter and added border with border resize.
Added comments to all classes
Minor change