Batch of updates

Jordan