Merge pull request #37 from thefinestsieve/beta

Latest round of cleanup