Added key mapping into robot and some fixes