Minor corrections, adding scope + adding comments