Cleanup.
Made context creation use correct CGDisplay.