Added jobs
Small bug fixes