Improvements and var name changes