0.31 a

many fixes with save test