fixed event form & added fields