Mehedee's updates are included and img cleanup