Minor additions/improvements.