tweaks and corrections
some tweaks