Update

Various fixes and updates.