removed summry and many fixes