implemented nice diff output and settings diagog, some cosmetic changes