Madd's improvements

Here are quite a few of my changes.

Note that you will need Xcode 5 to build it, and it'll run on Mountain Lion or later.