Allows CustomVariable key to be overwritten, this allows the user to add custom variables without the dimension as the key

Minor fixes failed build

Minor spacing