Updated filters. More minor bug fixes.