made some more edits to master