first cut of 1.4 changes, ready for testing