updates per narfbg's comments