several changes due to 0.9.0