Fixing

-
Fixing 2

Fixed issues.

Changes for today:
- Working on difftool