a few more tweaks and suggestions