added job handling... a bit... :)