Some entity structure and box2d prep updates