Some minor changes, now ready for release