Fixing some edits to master branch