minor changes from aaronw's review