docs, fixes, etc for 2.3