fix final callback values
stage 2 :)
add server