fix up boxfitting and comments