revise configuration
fix bugs