big fixed and updates