more points, fixes