Fixed some bugs, improved 'block'