before branch
merge
fixed scramble bug in gui
added some optimizations
updated check for 3x2-rule