Fixed waiting for main thread between modifications, fixes #6 Some safety when clearing, #7 seems fixed