theme tweaks, bug fixes, clean up