schema cleanup, metadata progress

finally got around to cleaning up schema junk.
good progress on meta-data