Many source updates and some other related changes.