fix #5, fix #6, major refactoring, new screenshots