revert loss of border when monocle and back
correct error in constraints calculation