Update to 0.7

Various improvements and fixes