Staging fixes

Not to change, but in the future I would say that this API would be cleaner if game was not in the options param