o Some code improvements (NS_ENUM, instancetype)
o Better synchronization for annotations in the quad tree