Minor changes. More tommorow.