commiting some changes
jpd -- committing changes that should bring thesis back up to pre-massive-data-loss-idiotic-commit