Some renames, filter instructions in oneStep
Fix mapping bug.