updated deps
fixed ifs issues