Peer review fixes initial commit