Updates

lots of updates