Two changes made in Writer for Apache OpenOffice 4.1 are presented from the developers point of view. One of these changes is to improve the user experience for editing Input Fields - the content of these fields can now be filled/changed directly inside the text document's content. The other is the enhancement to apply comments/annotations to arbitrary text ranges. The enhancement for the comments/annotations based on patches provided by the OOXML improvement project, initiated by the OSBA. First the impact of these changes for the user - which is the ultimate motivation for these changes - will be shortly presented. Afterwards the talk will concentrate on the code changes itself. It will be shown what kind of changes were needed and which parts of the code were touched. It will become clear why these two changes are somehow similar regarding the touched code. Used features, like the overlays from the drawing layer, will be discussed in detail. It is planned to give room for discussions on the made changes for better understanding, knowledge sharing and hopefully also further code improvements.