Added support for text in boxes, and minor code cleanup