Done some minor changes.