many things fixed. working on failing transfers
merge