Add plot observation now searches order and family. Some bug fixes and tweaks.