final merge update.

Should all be good now.