A few changes as requested.