added functionality to display favicon, left some comments in config-file and clean up with some indentations