Add (minor) documentation
Refactor logic
Add missing graphics