updated to fix many issues with gameplay