more changes/fixes