Updated lib
Fixed server error
Added stuff