fix mac build + some comments
another build fix