tweaks to mirror code
updated consts