Cleaned up bunch; reorganized slices and matching.