Add fixes to scheme.py and "UPDATED" comments.