huge fixes, all tests passed  successful