some minor changes/fixes