Bug Fixes in Features.py