More adjustments to allow clean loading
Big cleanup. Clean import of data, and documented errors for schema