Bad commit message.  Various updates.