- updated titles and text
- code cleanup