Bug fixing and adding some sensors