Fixed the flag and some blocks for better experience and chalenge