small bug fixes (variable name change, add no-op to if)