fix and more