Add comments to IS schema + 2 minor bugs.