fixed some fields not being matched properly, updated help menu