Updated to final version of spec

Updated to client + server to the final version of the spec + fixed compile issues