Latest changes before 0.7a

Latest changes before 0.7a