use the points system + minor bug fixes