I started mapping again after I found the Vespucci editor for Android. With it, I can create and tag nodes and ways in the field, upload it as a draft and make some improvements and corrections back home with a "proper" editor.