fix race conditions
update to 2.0 release