updated SCHEM to new format
general clean up