fixed some return values, formatted some docblocks better