Further updates and fixes