Improve and fix changes