Fixed watch to show remaining hours
Added message