Did some work in key handler and added language