more fields and some corrections