New simplified verificator structure, minor bugs fixes