Bug fix - initializing some arrays;