Fixed the expressions to do what the comment above says
Removed timestamp from the client since the server will automatically add it; removed TODOs and replaced double quotes with simple ones