making a manual pull request

making a manual pull request. this includes joel's changes.