fixed bunch of config issues