Modules now validate correctly
Removed some debgging code