Fix the many skipped edge cases
Clean up