Address some fmt and fix issues & update deps
#35
+28
−17
fmt and fix issues & update deps
#35