Another minor bug has been fixed
Some adjustment in event loading has been done