editing fields properly