Updates

Fix most of my derps