Stable version ready for testing

All comments complete