A bunch of changes

I didn't commit because I was busy at school and I was writing only in
my free time.