Cleaned up the orb, disc, and world code a bit