Added improvements coming from Steve's proofreading