Bug fixes / cleanup / begin implementing filter by stuff.