Numerous Updates

Numerous updates from group edit from today.