tweaks and additions