Fixing up a few details in the data entry system concerning events