Typo in javadoc
Dropping filter as it was a bad experiment
Many improvements