Minor fixes from the feature proposal for inclusion in nova