Updated XML comments, annotations, and factory layouts.