config and general fix