Limiting api and fixes from review.