Fixes and added job stuff