Fixed some stuff, prepared config switch