fixed some null atributes
use alexs yaml?
remove merge files
merged alexs changes, re-enabled try catch
merge 2?
alexs change?