Fine Tuning

Worked out a few corner case bugs (the corner is pretty big)