Removed separate 'blocks' file, fixed a few typos and updated comments.