fixed some parts; ..still better do some redesign for queueing of messages..