added more fields to jobdoc, some clean up, added claim functionallity