Thread-safety and data structures fixes
removed Collection<> references
reverted log labels back
Merge pull request #100 from davassi/thread-safety

Thread-safety and data structures fixes