more game master stuff
merge