Fixed some typos, more blockchain refactoring