Many bugfixes in gameplay