Fixed Collections Problems and more GUI updates