fix mac problem
fix mac bug
fix more mac bug
finally....
finish merge