MAC OS X testing

- updates were tested on mac os x with success;
- minor adjustments for os x