Fixed Warnings and Modified Event System