name and misc fixes
schema 2.0