More thread-safety fixes and more work on creatures