Updates for mac and initial setup