General update, Made quite a few changes

Updated most jobs, etc.