Updates

bunch o updates