fix and changes overal