cleaned up schemas (see note on issue) -- closes #16