polish up for 0.9.0