Improvements and work notes