Some Code Updated

- Fixed Events
- Some other fixes