Several updates and fixes.