Back to Mac OS X
better loading mechanism
cleanup