making some mac/linux changes
fixing some commit issues