working gis setup
New calculations and important fixes