Updates

Refactored a few things.