many fixes and one ongoing fix
further fixes. very close