Updates

Various updates and fixes