more null checking
optimized import
fixed oreDict with giant refactor