Bug fixes, still problem with config reloading