Made some changes suggested by my dad