Commenting complete and updates to client and app