Updates

Lots of adjustments and array additions