Added update delta to simulation
Fixed some small issues when switching between simulation and scanning
Store kCal internally as float, provide as int