Update class-jobs

A friend's suggestions and comments on the proposed class system