Fixed reset bug, more constants.