Added faster data loading and comments