view all 3.1 ~ many fixes