Watch is now default; tweak formatting