Fixed filter error. Many other small updates