Setup

Changes made while reviewing the setup process, as discussed.