Options is back
Small fixes in comments
Small fixes in comments