Near finished 0.8.1 (see CHANGES.txt)