Bugfixes and playtesting