update for moved annotation msgs (kinda pending redesign).