Change config and fix bugs