additions, improvements, and cleanup