inspected some more warnings and refined filtering