fixed some doc consistency and more