Various Updates

Blah :)