Made some fixes.