Minor changes to add useful info.