Further updates and cleanup