some refact + fitBounds correction