many fixes added