Add comments, fix some bugs and add barrel and vineyard to the blocks name list.