improve performance, animate markers on update
improve start up performance, refactored code