more tweaks and filling out