added a few more fields and comments