Corrections and completions of class loading; implement -x switch; correction to schema