Cleaned up stuff, added couting of points.