Impleted trait (and fixed some docblocks)