Some Fixes and Smartwatch Integration