Continued updates and mobile fixes for v2