Some small tweaks and adding back partials