fix eventsource timeout, some scripting and mapper improvements