Another bulk of changes, mainly raid frames and files I forgot the first
time