watch fixes, more