Added a few more fields
some minor changes
try to fix some event bugs
little changes