added redirect & changed lang check