19.03 2watch + small fixes