beta1 multi-thread + bug fixes