Minor tweaks as we've worked with it more