make mac work
8 files changed