merge jeff's stuff, did a new pull request