fixed bugs, points fully implemented