lost my days work
fixed all the issues at alast, tests pass, all green, happy days.