Tweaks I made with Dave
merged conflicts