Cleanup + Tests + Safari fix