Just a few addings and corrections here and there. This is going slooooowwww