fixes the counter when ids are reused
removes animation from markers; they look choppy on some devices
minor clean up