more fix and add