hm
Merge branch 'master' into enums
enums, to be tested yet. we need better menu ordering and smarter list