Fixed issues with Rewards and updated submodules