6th commit. Some minor changes.