Fixing some bugs, there is still event faulty event logic in here though