final touches for 0.9.1