Added documentation to almost every file on the client side
fixed merge error