Minor cosmetic changes, ready for release