Several fixes and updates.