several general fix