Adjust points + minor fixes