More updates by afwang that was done after the fork.
Added support for adding ship/resource data to events, along with 
changing my for loops to the short form.