new point system, bugs fixed