Performance and Mac fixes

Doubled performance, made looking around work again on Mac