tweaks and corrections
draining