Okay... that's looking way better

Mar edge cases.