A bit more tweaking

Module manager stuff