clean up and box physics better