Re-worked border conditions. Now they're looking good.
Vr still fails on non-linear borders. Fixing...