get server config back
browsers are get from master now

and various other changes