Polishing and api docs