Added commenting. Fixed visibility.
Hopefully fixed crashing when returning to app.
Merge branch 'master' into here