Minor tweaks to config and some variable names. Also added partials, but not the logic to parse them.