changes, untested, i need better access to os x...