Cleaned more, fixed file references