Fix rtrim regex
Add section "where"
Improve tenses/future