fixes
fixes
fixes
updated dependencies and code