add more configurations and fix minor mistakes