Fix and/or if statements, and name check in vf rm