Semper Fi! modules upgraded

[uckelman]

The modules are now fully functional again. Enjoy.