More Updates

Lots of updates going on...