Changed Grid and Box to pass syntax checks

There were a bunch of bugs...and we squished them