minor changes/fixes