Changes to reflect who deserves what credit. #1