Makes it work better on mac and add better configuration