Added some stuff to the Box and squashed some bugs.