fix messages, add queue check
0.0.3