D29 - Hell tweaks - OSX COMMIT. MERGE WITH CAUTION!