things
fix and changes