Sensor bug fix, renamed a couple things