Fixes and two diagrams working. TODO - fix multifilter.