v2.3~final

Last minute changes to v2.3