Updates

Changes made in production.. mostly tweaks