added a qwerty layout for myself; fixed a couple includes