Some minor changes.
verifed for running.