some gameplay fixes