fix and add features