Upload 2

Minor setup changes.