messages update, minor cleanup