Cleaned some jobs + Bug fixes