Finish problems 1 and 2
Fix file naming error