Minor tweaks and testing.