Some minor changes: