Documentation and few minor fixes