cleaned a bit more

*Changed some, hopefully all, of the hardcoded ID references to
variables.
*Stripped our silly old world

Still a mess, but maybe less of a mess!