fix and updates