updates based on comments on #15