Minor bug fixes and minor cosmetic adjustment.