Fixed some problems and continued level 2
I'm about to bluerinse the computer, so I'm comitting