Non-static temporary storage for points and annotations
Use NSUInteger everywhere
Remove import of unneeded assert.h
Minor changes