did some minor changes.