Update the extract script with better xz and rpm handling
More nocorrects
Don't include directories when greping