Various improvements I'm too tired to list.