Committing substantial improvments to JobActivity Code, and fixing issue