Gameplay fixes mostly done