Update the module to be relevant

Various changes/impovements to be relevant on newer iterations of distro versions