Setup watch items before calling for them

Closes a short window of ignored updates.
Minor comment fixup
Prefix hooks