fixed doc styling from previous merge
completed merge cleanup of api docs