updates from Beantown. Probably the last commit for this repo.