Bug fixes
Uncommented feature