some touchup to code, etc