adding wait messages, style tweak.