Almost done with handling weird edge-case glitches.