added indents (duh) + changed inputfiles