Few gameplay fixes