Small setup adjustments and changes file