Editing and Filtering documentation

Fixes #135
Fixes #136
And since it was a one line change, also fixes #125