Kinda merging mac branch into archlinux. (manually)