fix expand key
some more kbd fixes