Added a bunch of tweaks suggested by reviewers