Update

Various updates and fixes.