made some fixes.