bunch of sanity tweaks