Updated loading and added comments