pulled from forcingbug
pulled fix from forcing bug branch for forcing bug in unfeasible space
fixed bugs and got two optimizations working