Fixes and touchups.