Minor updates & 2 more fields