multiple changes/fixes