mods
fixed keychecking
Merge branch 'd2d_patterns_more' into refactoring