Fixes and added sensors