Datawarehouse big update + multiple fixes