intro of browsers and states services and some other cleanups