some corrections
fixed merge conflict
Merge branch 'cordoval-3-some-corrections-using-gush'