favicon
bugfixes, refactoring