Modifs on schema name; add last comments