Improvements all around