Updates

Cleaning up and updates