Add a lot of new features for mac