made some tweaks, per David's request.