ref #80: missing part improvements