Fix Broken .with/.without and misc other issues

closes #89