Adding some border extends and cleaning things up accordingly
Merge pull request #28 from shayhowe/borders

Adding some border extends and cleaning things up accordingly