bug fixes and reload config improvements