Fixed some TODO, modified class Blocks
Fixed some TODO, modified class Blocks