Add a few updates/improvements.