accidentally discarded last two months of changes to source ... slowly fixing