introduced more send messages, changed some case statements