several tweaks