wip: Group loan bugs fixed