Some aesthetics corrected