finished points and bug fixes