Added filter, fixed dropWhile