Fix docblox and typos