#173 #174 More testing. Some more concurrent access issues.