Fixed minor bugs when checking final result. Added more config files.