Fixed clock not being set on the watch

Clock on the watch now works but bitmap still wrong on phone. Still to
be sorted.