added comments and fixed small bugs
added numeric simplified shape for mixed game
merge number and number simplified shapes