Update with control keys, sort lists and bugfixes

merge