Updates

Multiple changes