Schema completed. Minor fixes.
Schema fixed