API for subscribe polished, added timeouts
scramble for web clients