Theme integration.  Minor bug fixes. Minor code cleanup.