Minore changes. Ready for test.