config cleanup & fix problems