change due after check overpaymet
Merge of Leah to mine and fixes