Mac QA

I just need to finish Mac QA