variable and message fix