several refinements

adding part awareness and tweaking tests