made changes suggested by Neil

@kcranston: here you go!