Docblocks + bug fixes.