Change return types and add docs; switches comment to correct require