Made some small changes. Things are kind of messed up.