fix too many warning messages and add verify button