Updated setup to reflect r121, and my contact information