keyboard problems seems to be solved
added TODO