Brought messages files up to date.
Fixed some null pointer and id override strangeness.