Minor changes. Ready to run.