fixed local server discovery, added timer and tweaks