Some changes
And fixing certain os x issues