some extra things

ok i'll do that. I still say do it on line 35 because there is duplication in other if statements nested inside that one