Improved torch handler
Comment suggestions
Merge pull request #1489 from mc-server/fixes

Improved torch handler