Various fixes and updates.