Tweaking "box" names in core
Renaming box types to be more intuitive
Bug fixes & improvements