Small updates and fixes