fixed and updates