cleanup:
- commented out stuff removed
- backbutton renamed