Many updates and fixes.