Changed a few small things around to aid in autoloading.