Minor markup changes, validation corrections.