Cleaning up output, adding fitbit sensor and fixing dependencies