sorted out big keyboard mess in this and prev commit