Added tab/shift-tab and stuff