fixes, additions, thread