Bug fixes and filter enhancements

closes #44
closes #45