refining some end game stuff