expanded tests, rewrote concurrent queue, etc.