Updates from maclab/game-on as well as locking by category/careers