small tweaks and additions