Updated todo and added comments to server