fixing modules for #224

Not sure you should take up this PR. I messed up my history. I guess I should just delete my fork and restart fresh. Let me know.