Merge pull request #2 from swingingsimian/master

Sort and delete intermediary fixes