Fix the main screenshot and a few documentation issues.
Some minor code refactoring.