Final Updates

Yea!