Inline documentation, some name changes