more @andrewjstone suggested changes