Major update

Now works with card array in drinkers. Many minor bug fixes.