Big fix + update informations when marker move