progress with filtering, visuals.  some visual issues still