Several minor improvements and updates.