Added Box and Shell, fixed a few minor things.