updated to 0.20.1
minor improvements to avoid timing problems