Misc improvements, 0.9.1