Schema: comments and some bug fixes.