Schema updated, other minor fixes.