Many fixes from playtest