better behaviour of tab key and general changes