Move Config, more bugfixes