commit to change to the master branch
almost fixed all errors