Enhancement: Fixed up jobs module some