Re-submitted version - comments and some polishing