Made some fixes here and there.