Added points, minor fixes