and fix and add some