Fix bugs and special events calling