refactored a few things; sanitary ifs
Merge branch 'master' into draft4
rough draft of complex schema for benchmarking
wip on the valid_doc for complex bm