functions review
documentation and reviews
documentation and revisions
fixing merge problems