little changes/fixes