multiple changes and fixes