Review, updated docs