Added another bunch of fixes suggested by reviewers