Attempt to fix various nits.