edits for os x and update of stuff