Filter added, fixed some typos