Minor tweaks and fixes, cleanup.