General cleanup and updates.