Merge pull request #77 from thefinestsieve/beta

More flavor + two fixes