Update with various fixes.