Cleaned Up a bit
- Corrected a small bug in registering new modules