-menu fixes and mac migration