added field rename, getting address for next field and some formatting updates