Some changes
merged branches with cory, fixed conflicts