many updates to plotting and FDB handling