small updates and more fields