Improvements, ready for submission